bitkeeper revision 1.1159.1.508 (41d2c334D3CtOjd6Glhc_MnA3jjEGQ)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 29 Dec 2004 14:46:12 +0000 (14:46 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 29 Dec 2004 14:46:12 +0000 (14:46 +0000)
commitf6c136d3fa3c7f19565c4a237b207ac36dae80f8
treec36c049c36d6f87687cde499cbf81c8c7c4e6c3b
parentb0d400dfba2b8517f00434a9c15826dac6327673
bitkeeper revision 1.1159.1.508 (41d2c334D3CtOjd6Glhc_MnA3jjEGQ)

manual merge
xen/arch/x86/traps.c
xen/common/kernel.c